commit 619596afe5769620cfbaca941f701a3fa106e6e5
author Junio C Hamano <junio@kernel.org> Wed Aug 18 22:15:35 2010
committer Junio C Hamano <junio@kernel.org> Wed Aug 18 22:15:35 2010
tree a0065a9102205adf638a7ff9e35bb50ce049dcd0
parent b5a296fa6d8cd1a703ce2eb6232e0bbc654bd2a2

Autogenerated HTML docs for v1.7.2.1-158-gbd3a97 

git-checkout.html

diff --git a/git-checkout.html b/git-checkout.html index a5648ec..d15107a 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -322,7 +322,7 @@  <div class="sectionbody">   <div class="verseblock">   <div class="content"><em>git checkout</em> [-q] [-f] [-m] [&lt;branch&gt;]  -<em>git checkout</em> [-q] [-f] [-m] [[-b|--orphan] &lt;new_branch&gt;] [&lt;start_point&gt;]  +<em>git checkout</em> [-q] [-f] [-m] [[-b|-B|--orphan] &lt;new_branch&gt;] [&lt;start_point&gt;]   <em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=&lt;style&gt;] [&lt;tree-ish&gt;] [--] &lt;paths&gt;&#8230;   <em>git checkout</em> --patch [&lt;tree-ish&gt;] [--] [&lt;paths&gt;&#8230;]</div></div>   </div>  @@ -337,7 +337,7 @@  <em>git checkout</em> [&lt;branch&gt;]   </dt>   <dt>  -<em>git checkout</em> -b &lt;new branch&gt; [&lt;start point&gt;]  +<em>git checkout</em> -b|-B &lt;new_branch&gt; [&lt;start point&gt;]   </dt>   <dd>   <p>  @@ -349,6 +349,15 @@  use the <tt>--track</tt> or <tt>--no-track</tt> options, which will be passed to   <em>git branch</em>. As a convenience, <tt>--track</tt> without <tt>-b</tt> implies branch   creation; see the description of <tt>--track</tt> below.</p></div>  +<div class="para"><p>If <tt>-B</tt> is given, &lt;new_branch&gt; is created if it doesn't exist; otherwise, it  +is reset. This is the transactional equivalent of</p></div>  +<div class="listingblock">  +<div class="content">  +<pre><tt>$ git branch -f &lt;branch&gt; [&lt;start point&gt;]  +$ git checkout &lt;branch&gt;</tt></pre>  +</div></div>  +<div class="para"><p>that is to say, the branch is not reset/created unless "git checkout" is  +successful.</p></div>   </dd>   <dt>   <em>git checkout</em> [--patch] [&lt;tree-ish&gt;] [--] &lt;pathspec&gt;&#8230;  @@ -425,6 +434,17 @@  </p>   </dd>   <dt>  +-B  +</dt>  +<dd>  +<p>  + Creates the branch &lt;new_branch&gt; and start it at &lt;start_point&gt;;  + if it already exists, then reset it to &lt;start_point&gt;. This is  + equivalent to running "git branch" with "-f"; see  + <a href="git-branch.html">git-branch(1)</a> for details.  +</p>  +</dd>  +<dt>   -t   </dt>   <dt>  @@ -727,7 +747,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-07-21 21:55:16 UTC  +Last updated 2010-08-18 22:14:47 UTC   </div>   </div>   </body>